From: Keir Fraser <keir.fraser@citrix.com>
Date: Mon, 12 Jul 2010 09:48:04 +0000 (+0100)
Subject: x86 cpufreq: Fix debug=y build.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~11802
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=b298f3d27fecd3c896b69529b5603e5879f55749;p=xen.git

x86 cpufreq: Fix debug=y build.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
---

diff --git a/xen/arch/x86/acpi/cpufreq/cpufreq.c b/xen/arch/x86/acpi/cpufreq/cpufreq.c
index edd581ba94..26339a0867 100644
--- a/xen/arch/x86/acpi/cpufreq/cpufreq.c
+++ b/xen/arch/x86/acpi/cpufreq/cpufreq.c
@@ -180,7 +180,7 @@ static void drv_read(struct drv_cmd *cmd)
 {
     cmd->val = 0;
 
-    ASSERT(cpus_weight(cmd->mask) == 1);
+    ASSERT(cpumask_weight(cmd->mask) == 1);
 
     /* to reduce IPI for the sake of performance */
     if (likely(cpumask_test_cpu(smp_processor_id(), cmd->mask)))
diff --git a/xen/include/xen/cpumask.h b/xen/include/xen/cpumask.h
index 4dbb3054ce..5de90747ba 100644
--- a/xen/include/xen/cpumask.h
+++ b/xen/include/xen/cpumask.h
@@ -192,6 +192,7 @@ static inline int __cpus_full(const cpumask_t *srcp, int nbits)
 	return bitmap_full(srcp->bits, nbits);
 }
 
+#define cpumask_weight(cpumask) __cpus_weight(cpumask, NR_CPUS)
 #define cpus_weight(cpumask) __cpus_weight(&(cpumask), NR_CPUS)
 static inline int __cpus_weight(const cpumask_t *srcp, int nbits)
 {